Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 30 Jun 2010 22:57:08 +0000 (22:57 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 30 Jun 2010 22:57:08 +0000 (22:57 +0000)
commit0df759c1105920fa8b48e1c5f582bf689c39b3c4
treeeba597e80677fc2469550f18eae018fb11f14639
parent50e3b9c4fc1ff8ad57c3e2a39397c1ceb2d20fca
parente21d647aeb929b317942ab82652260e0e660d46d
Merge from mainline.